Merged from gtk-2-6:

2005-02-01  Federico Mena Quintero  <federico@ximian.com>

	Merged from gtk-2-6:

	* gtk/gtkfilechooserdefault.c
	(browse_files_model_finished_loading_cb): Don't
	g_assert_not_reached() if we are in any other state.  Another code
	path may have triggered a folder reload.  Fixes #165556.

diff --git a/ChangeLog b/ChangeLog
index 260284db9d003738373c0810617695cee2b25d35..605529304e4970119ae67d97dfcba7dd4cbb3bef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c
+       (browse_files_model_finished_loading_cb): Don't
+       g_assert_not_reached() if we are in any other state.  Another code
+       path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 260284db9d003738373c0810617695cee2b25d35..605529304e4970119ae67d97dfcba7dd4cbb3bef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c
+       (browse_files_model_finished_loading_cb): Don't
+       g_assert_not_reached() if we are in any other state.  Another code
+       path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 260284db9d003738373c0810617695cee2b25d35..605529304e4970119ae67d97dfcba7dd4cbb3bef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-02-01  Federico Mena Quintero  <federico@ximian.com>
+
+       Merged from gtk-2-6:
+
+       * gtk/gtkfilechooserdefault.c
+       (browse_files_model_finished_loading_cb): Don't
+       g_assert_not_reached() if we are in any other state.  Another code
+       path may have triggered a folder reload.  Fixes #165556.
+
 2005-02-01  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index e55998dc9e8dc77522f62af32df82cae132647ed..c2e0f8e6031e47d24f0fad98cde1ac11436267fc 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -4612,7 +4612,12 @@ browse_files_model_finished_loading_cb (GtkFileSystemModel    *model,
       /* Nothing */
     }
   else
-    g_assert_not_reached ();
+    {
+      /* We can't g_assert_not_reached(), as something other than us may have
+       *  initiated a folder reload.  See #165556.
+       */
+      return;
+    }
 
   g_assert (impl->load_timeout_id == 0);